Merge tag 'upstream/2016.9' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 6 Sep 2016 08:14:31 +0000 (09:14 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 6 Sep 2016 08:14:31 +0000 (09:14 +0100)
Upstream version 2016.9


Trivial merge